From 50f73cbac35be97fd5895531e295d05dabaa8ed9 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Sun, 7 May 2017 20:57:53 +0100 Subject: [PATCH] build: Add -C arguments to some git invocations MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This moves the build system a little closer towards being safe for builddir ≠ srcdir. Signed-off-by: Philip Withnall Closes: #832 Approved by: cgwalters --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 78cd6653..be505522 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ include Makefile-decls.am shortened_sysconfdir = $$(echo "$(sysconfdir)" | sed -e 's|^$(prefix)||' -e 's|^/||') -OSTREE_GITREV=$(shell if command -v git >/dev/null 2>&1 && test -d $(srcdir)/.git; then git describe --abbrev=42 --tags --always HEAD; fi) +OSTREE_GITREV=$(shell if command -v git >/dev/null 2>&1 && test -d $(srcdir)/.git; then git -C $(srcdir) describe --abbrev=42 --tags --always HEAD; fi) ACLOCAL_AMFLAGS = -I buildutil -I libglnx ${ACLOCAL_FLAGS} AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \ @@ -113,11 +113,11 @@ include Makefile-boot.am include Makefile-man.am release-tag: - git tag -m "Release $(VERSION)" v$(VERSION) + git -C $(srcdir) tag -m "Release $(VERSION)" v$(VERSION) embed_dependency=tar -C $(srcdir) --append --exclude='.git/*' --transform="s,^embedded-dependencies/,ostree-embeddeps-$${GITVERSION}/embedded-dependencies/," --file=$${TARFILE_TMP} -git_version_rpm = $$(git describe | sed -e 's,-,\.,g' -e 's,^v,,') +git_version_rpm = $$(git -C $(srcdir) describe | sed -e 's,-,\.,g' -e 's,^v,,') release-tarball-embedded: set -x; \ -- 2.30.2